diff --git a/signals/commands/policies/pom.xml b/signals/commands/policies/pom.xml
index 9c0274c24e..0e13b40089 100755
--- a/signals/commands/policies/pom.xml
+++ b/signals/commands/policies/pom.xml
@@ -73,13 +73,6 @@
                         <excludes>
                             <!-- Don't add excludes here before checking with the whole Ditto team -->
                             <!--<exclude></exclude>-->
-                            <!-- TODO temp. exclude - try to stay compatible later -->
-                            <exclude>org.eclipse.ditto.signals.commands.policies.modify.ModifySubjectResponse#modified(org.eclipse.ditto.model.policies.PolicyId,org.eclipse.ditto.model.policies.Label,org.eclipse.ditto.model.base.headers.DittoHeaders)</exclude>
-                            <exclude>org.eclipse.ditto.signals.commands.policies.modify.ModifyPolicyEntryResponse#modified(org.eclipse.ditto.model.policies.PolicyId,org.eclipse.ditto.model.base.headers.DittoHeaders)</exclude>
-                            <exclude>org.eclipse.ditto.signals.commands.policies.modify.ModifyResourceResponse#modified(org.eclipse.ditto.model.policies.PolicyId,org.eclipse.ditto.model.policies.Label,org.eclipse.ditto.model.base.headers.DittoHeaders)</exclude>
-                            <exclude>org.eclipse.ditto.signals.commands.policies.modify.ModifyPolicyEntryResponse#modified(java.lang.String,org.eclipse.ditto.model.base.headers.DittoHeaders)</exclude>
-                            <exclude>org.eclipse.ditto.signals.commands.policies.modify.ModifyResourceResponse#modified(java.lang.String,org.eclipse.ditto.model.policies.Label,org.eclipse.ditto.model.base.headers.DittoHeaders)</exclude>
-                            <exclude>org.eclipse.ditto.signals.commands.policies.modify.ModifySubjectResponse#modified(java.lang.String,org.eclipse.ditto.model.policies.Label,org.eclipse.ditto.model.base.headers.DittoHeaders)</exclude>
                         </excludes>
                     </parameter>
                 </configuration>
diff --git a/signals/commands/policies/src/main/java/org/eclipse/ditto/signals/commands/policies/modify/ModifyPolicyEntryResponse.java b/signals/commands/policies/src/main/java/org/eclipse/ditto/signals/commands/policies/modify/ModifyPolicyEntryResponse.java
index 522d72fd30..2a79e30717 100755
--- a/signals/commands/policies/src/main/java/org/eclipse/ditto/signals/commands/policies/modify/ModifyPolicyEntryResponse.java
+++ b/signals/commands/policies/src/main/java/org/eclipse/ditto/signals/commands/policies/modify/ModifyPolicyEntryResponse.java
@@ -39,6 +39,7 @@
 import org.eclipse.ditto.model.policies.PolicyId;
 import org.eclipse.ditto.signals.commands.base.AbstractCommandResponse;
 import org.eclipse.ditto.signals.commands.base.CommandResponseJsonDeserializer;
+import org.eclipse.ditto.signals.commands.policies.PolicyCommandResponse;
 
 /**
  * Response to a {@link ModifyPolicyEntry} command.
@@ -60,20 +61,19 @@ public final class ModifyPolicyEntryResponse extends AbstractCommandResponse<Mod
             JsonFactory.newJsonValueFieldDefinition("policyEntry", FieldType.REGULAR, JsonSchemaVersion.V_2);
 
     private final PolicyId policyId;
-    private final Label label;
+    @Nullable private final Label label;
     @Nullable private final PolicyEntry policyEntryCreated;
 
     private ModifyPolicyEntryResponse(final PolicyId policyId,
             final HttpStatusCode statusCode,
             @Nullable final PolicyEntry policyEntryCreated,
-            final Label label,
+            @Nullable final Label label,
             final DittoHeaders dittoHeaders) {
 
         super(TYPE, statusCode, dittoHeaders);
         this.policyId = checkNotNull(policyId, "Policy ID");
         this.policyEntryCreated = policyEntryCreated;
-        this.label = checkNotNull(label, "label");
-        ;
+        this.label = label;
     }
 
     /**
@@ -125,6 +125,37 @@ public static ModifyPolicyEntryResponse created(final PolicyId policyId, final P
      * instead.
      */
     @Deprecated
+    public static ModifyPolicyEntryResponse modified(final String policyId, final DittoHeaders dittoHeaders) {
+        return modified(PolicyId.of(policyId), null, dittoHeaders);
+    }
+
+    /**
+     * Creates a response to a {@code ModifyPolicyEntry} command.
+     *
+     * @param policyId the Policy ID of the modified policy entry.
+     * @param dittoHeaders the headers of the preceding command.
+     * @return the response.
+     * @throws NullPointerException if any argument is {@code null}.
+     * @deprecated since 1.1.0, use {@link #modified(PolicyId, Label, DittoHeaders)} instead.
+     */
+    @Deprecated
+    public static ModifyPolicyEntryResponse modified(final PolicyId policyId, final DittoHeaders dittoHeaders) {
+        return modified(policyId, null, dittoHeaders);
+    }
+    /**
+     * Creates a response to a {@code ModifyPolicyEntry} command.
+     *
+     * @param policyId the Policy ID of the modified policy entry.
+     * @param label the label of the modified policy entry.
+     * @param dittoHeaders the headers of the preceding command.
+     * @return the response.
+     * @throws NullPointerException if any argument is {@code null}.
+     * @deprecated Policy Id is now Typed. Use
+     * {@link #modified(org.eclipse.ditto.model.policies.PolicyId, org.eclipse.ditto.model.policies.Label,
+     * org.eclipse.ditto.model.base.headers.DittoHeaders)}
+     * instead.
+     */
+    @Deprecated
     public static ModifyPolicyEntryResponse modified(final String policyId, final Label label,
             final DittoHeaders dittoHeaders) {
         return modified(PolicyId.of(policyId), label, dittoHeaders);
@@ -134,6 +165,7 @@ public static ModifyPolicyEntryResponse modified(final String policyId, final La
      * Creates a response to a {@code ModifyPolicyEntry} command.
      *
      * @param policyId the Policy ID of the modified policy entry.
+     * @param label the label of the modified policy entry.
      * @param dittoHeaders the headers of the preceding command.
      * @return the response.
      * @throws NullPointerException if any argument is {@code null}.
@@ -170,19 +202,20 @@ public static ModifyPolicyEntryResponse fromJson(final String jsonString, final
      */
     public static ModifyPolicyEntryResponse fromJson(final JsonObject jsonObject, final DittoHeaders dittoHeaders) {
         return new CommandResponseJsonDeserializer<ModifyPolicyEntryResponse>(TYPE, jsonObject)
-                .deserialize((statusCode) -> {
+                .deserialize(statusCode -> {
                     final String extractedPolicyId =
-                            jsonObject.getValueOrThrow(PolicyModifyCommandResponse.JsonFields.JSON_POLICY_ID);
+                            jsonObject.getValueOrThrow(PolicyCommandResponse.JsonFields.JSON_POLICY_ID);
                     final PolicyId policyId = PolicyId.of(extractedPolicyId);
-                    final Label readLabel = Label.of(jsonObject.getValueOrThrow(JSON_LABEL));
+                    final Optional<String> readLabel = jsonObject.getValue(JSON_LABEL);
 
                     final PolicyEntry extractedPolicyEntryCreated = jsonObject.getValue(JSON_POLICY_ENTRY)
                             .filter(JsonValue::isObject)
                             .map(JsonValue::asObject)
-                            .map(obj -> PoliciesModelFactory.newPolicyEntry(readLabel, obj))
+                            .flatMap(obj -> readLabel.map(label -> PoliciesModelFactory.newPolicyEntry(label, obj)))
                             .orElse(null);
 
-                    return new ModifyPolicyEntryResponse(policyId, statusCode, extractedPolicyEntryCreated, readLabel,
+                    return new ModifyPolicyEntryResponse(policyId, statusCode, extractedPolicyEntryCreated,
+                            readLabel.map(Label::of).orElse(null),
                             dittoHeaders);
                 });
     }
@@ -208,14 +241,9 @@ public Optional<JsonValue> getEntity(final JsonSchemaVersion schemaVersion) {
 
     @Override
     public JsonPointer getResourcePath() {
-
-        final Label label;
-        if (policyEntryCreated == null) {
-            label = this.label;
-        } else {
-            label = policyEntryCreated.getLabel();
+        if (null == label) {
+            return JsonPointer.empty();
         }
-
         final String path = "/entries/" + label;
         return JsonPointer.of(path);
     }
@@ -225,9 +253,11 @@ protected void appendPayload(final JsonObjectBuilder jsonObjectBuilder, final Js
             final Predicate<JsonField> thePredicate) {
 
         final Predicate<JsonField> predicate = schemaVersion.and(thePredicate);
-        jsonObjectBuilder.set(PolicyModifyCommandResponse.JsonFields.JSON_POLICY_ID, String.valueOf(policyId),
+        jsonObjectBuilder.set(PolicyCommandResponse.JsonFields.JSON_POLICY_ID, String.valueOf(policyId),
                 predicate);
-        jsonObjectBuilder.set(JSON_LABEL, label.toString(), predicate);
+        if (null != label) {
+            jsonObjectBuilder.set(JSON_LABEL, label.toString(), predicate);
+        }
         if (null != policyEntryCreated) {
             jsonObjectBuilder.set(JSON_POLICY_ENTRY, policyEntryCreated.toJson(schemaVersion, thePredicate), predicate);
         }
diff --git a/signals/commands/policies/src/main/java/org/eclipse/ditto/signals/commands/policies/modify/ModifyResourceResponse.java b/signals/commands/policies/src/main/java/org/eclipse/ditto/signals/commands/policies/modify/ModifyResourceResponse.java
index 74719a60d1..1fabc1eb01 100755
--- a/signals/commands/policies/src/main/java/org/eclipse/ditto/signals/commands/policies/modify/ModifyResourceResponse.java
+++ b/signals/commands/policies/src/main/java/org/eclipse/ditto/signals/commands/policies/modify/ModifyResourceResponse.java
@@ -40,6 +40,7 @@
 import org.eclipse.ditto.model.policies.ResourceKey;
 import org.eclipse.ditto.signals.commands.base.AbstractCommandResponse;
 import org.eclipse.ditto.signals.commands.base.CommandResponseJsonDeserializer;
+import org.eclipse.ditto.signals.commands.policies.PolicyCommandResponse;
 
 /**
  * Response to a {@link ModifyResource} command.
@@ -65,12 +66,12 @@ public final class ModifyResourceResponse extends AbstractCommandResponse<Modify
 
     private final PolicyId policyId;
     private final Label label;
-    private final ResourceKey resourceKey;
+    @Nullable private final ResourceKey resourceKey;
     @Nullable private final Resource resourceCreated;
 
     private ModifyResourceResponse(final PolicyId policyId,
             final Label label,
-            final ResourceKey resourceKey,
+            @Nullable final ResourceKey resourceKey,
             @Nullable final Resource resourceCreated,
             final HttpStatusCode statusCode,
             final DittoHeaders dittoHeaders) {
@@ -78,7 +79,7 @@ private ModifyResourceResponse(final PolicyId policyId,
         super(TYPE, statusCode, dittoHeaders);
         this.policyId = checkNotNull(policyId, "Policy ID");
         this.label = checkNotNull(label, "Label");
-        this.resourceKey = checkNotNull(resourceKey, "resourceKey");
+        this.resourceKey = resourceKey;
         this.resourceCreated = resourceCreated;
     }
 
@@ -132,6 +133,38 @@ public static ModifyResourceResponse created(final PolicyId policyId,
      * @return the response.
      * @throws NullPointerException if any argument is {@code null}.
      * @deprecated Policy ID is now typed. Use
+     * {@link #modified(org.eclipse.ditto.model.policies.PolicyId, org.eclipse.ditto.model.policies.Label, org.eclipse.ditto.model.policies.ResourceKey, org.eclipse.ditto.model.base.headers.DittoHeaders)}
+     * instead.
+     */
+    @Deprecated
+    public static ModifyResourceResponse modified(final String policyId, final Label label, final DittoHeaders dittoHeaders) {
+        return modified(PolicyId.of(policyId), label, null, dittoHeaders);
+    }
+
+    /**
+     * Creates a response to a {@code ModifyResource} command.
+     *
+     * @param policyId the Policy ID of the modified resource.
+     * @param label the Label of the PolicyEntry.
+     * @param dittoHeaders the headers of the preceding command.
+     * @return the response.
+     * @throws NullPointerException if any argument is {@code null}.
+     * @deprecated since 1.1.0, use {@link #modified(PolicyId, Label, ResourceKey, DittoHeaders)} instead.
+     */
+    @Deprecated
+    public static ModifyResourceResponse modified(final PolicyId policyId, final Label label, final DittoHeaders dittoHeaders) {
+        return modified(PolicyId.of(policyId), label, null, dittoHeaders);
+    }
+    /**
+     * Creates a response to a {@code ModifyResource} command.
+     *
+     * @param policyId the Policy ID of the modified resource.
+     * @param label the Label of the PolicyEntry.
+     * @param resourceKey the resource key of the modified resource
+     * @param dittoHeaders the headers of the preceding command.
+     * @return the response.
+     * @throws NullPointerException if any argument is {@code null}.
+     * @deprecated Policy ID is now typed. Use
      *
      *
      *
@@ -189,21 +222,22 @@ public static ModifyResourceResponse fromJson(final String jsonString, final Dit
     public static ModifyResourceResponse fromJson(final JsonObject jsonObject, final DittoHeaders dittoHeaders) {
         return new CommandResponseJsonDeserializer<ModifyResourceResponse>(TYPE, jsonObject).deserialize(statusCode -> {
             final String extractedPolicyId =
-                    jsonObject.getValueOrThrow(PolicyModifyCommandResponse.JsonFields.JSON_POLICY_ID);
+                    jsonObject.getValueOrThrow(PolicyCommandResponse.JsonFields.JSON_POLICY_ID);
             final PolicyId policyId = PolicyId.of(extractedPolicyId);
 
             final String stringLabel = jsonObject.getValueOrThrow(JSON_LABEL);
             final Label label = PoliciesModelFactory.newLabel(stringLabel);
 
-            final ResourceKey extractedResourceKey =
-                    ResourceKey.newInstance(jsonObject.getValueOrThrow(JSON_RESOURCE_KEY));
+            final Optional<ResourceKey> extractedResourceKey = jsonObject.getValue(JSON_RESOURCE_KEY)
+                    .map(ResourceKey::newInstance);
 
             final Resource extractedResourceCreated = jsonObject.getValue(JSON_RESOURCE)
                     .map(JsonValue::asObject)
-                    .map(obj -> PoliciesModelFactory.newResource(extractedResourceKey, obj))
+                    .flatMap(obj -> extractedResourceKey.map(resourceKey -> PoliciesModelFactory.newResource(resourceKey, obj)))
                     .orElse(null);
 
-            return new ModifyResourceResponse(policyId, label, extractedResourceKey, extractedResourceCreated,
+            return new ModifyResourceResponse(policyId, label,
+                    extractedResourceKey.map(ResourceKey::newInstance).orElse(null), extractedResourceCreated,
                     statusCode, dittoHeaders);
         });
     }
@@ -247,10 +281,12 @@ protected void appendPayload(final JsonObjectBuilder jsonObjectBuilder, final Js
             final Predicate<JsonField> thePredicate) {
 
         final Predicate<JsonField> predicate = schemaVersion.and(thePredicate);
-        jsonObjectBuilder.set(PolicyModifyCommandResponse.JsonFields.JSON_POLICY_ID, String.valueOf(policyId),
+        jsonObjectBuilder.set(PolicyCommandResponse.JsonFields.JSON_POLICY_ID, String.valueOf(policyId),
                 predicate);
         jsonObjectBuilder.set(JSON_LABEL, label.toString(), predicate);
-        jsonObjectBuilder.set(JSON_RESOURCE_KEY, resourceKey.toString(), predicate);
+        if (null != resourceKey) {
+            jsonObjectBuilder.set(JSON_RESOURCE_KEY, resourceKey.toString(), predicate);
+        }
         if (null != resourceCreated) {
             jsonObjectBuilder.set(JSON_RESOURCE, resourceCreated.toJson(schemaVersion, thePredicate), predicate);
         }
diff --git a/signals/commands/policies/src/main/java/org/eclipse/ditto/signals/commands/policies/modify/ModifySubjectResponse.java b/signals/commands/policies/src/main/java/org/eclipse/ditto/signals/commands/policies/modify/ModifySubjectResponse.java
index 99ff362fcc..3289a2bdd5 100755
--- a/signals/commands/policies/src/main/java/org/eclipse/ditto/signals/commands/policies/modify/ModifySubjectResponse.java
+++ b/signals/commands/policies/src/main/java/org/eclipse/ditto/signals/commands/policies/modify/ModifySubjectResponse.java
@@ -40,6 +40,7 @@
 import org.eclipse.ditto.model.policies.SubjectId;
 import org.eclipse.ditto.signals.commands.base.AbstractCommandResponse;
 import org.eclipse.ditto.signals.commands.base.CommandResponseJsonDeserializer;
+import org.eclipse.ditto.signals.commands.policies.PolicyCommandResponse;
 
 /**
  * Response to a {@link ModifySubject} command.
@@ -66,19 +67,19 @@ public final class ModifySubjectResponse extends AbstractCommandResponse<ModifyS
 
     private final PolicyId policyId;
     private final Label label;
-    private final SubjectId subjectId;
+    @Nullable private final SubjectId subjectId;
     @Nullable private final Subject subjectCreated;
 
     private ModifySubjectResponse(final PolicyId policyId,
             final Label label,
-            final SubjectId subjectId,
+            @Nullable final SubjectId subjectId,
             @Nullable final Subject subjectCreated,
             final HttpStatusCode statusCode,
             final DittoHeaders dittoHeaders) {
 
         super(TYPE, statusCode, dittoHeaders);
         this.policyId = checkNotNull(policyId, "policyId");
-        this.subjectId = checkNotNull(subjectId, "subjectId");
+        this.subjectId = subjectId;
         this.label = checkNotNull(label, "label");
         this.subjectCreated = subjectCreated;
     }
@@ -124,6 +125,39 @@ public static ModifySubjectResponse created(final PolicyId policyId,
                 HttpStatusCode.CREATED, dittoHeaders);
     }
 
+    /**
+     * Creates a response to a {@code ModifySubject} command.
+     *
+     * @param policyId the Policy ID of the modified subject.
+     * @param label the Label of the PolicyEntry.
+     * @param dittoHeaders the headers of the preceding command.
+     * @return the response.
+     * @throws NullPointerException if any argument is {@code null}.
+     * @deprecated Policy ID is now typed. Use
+     * {@link #modified(org.eclipse.ditto.model.policies.PolicyId, org.eclipse.ditto.model.policies.Label, org.eclipse.ditto.model.policies.SubjectId, org.eclipse.ditto.model.base.headers.DittoHeaders)}
+     * instead.
+     */
+    @Deprecated
+    public static ModifySubjectResponse modified(final String policyId, final Label label, final DittoHeaders dittoHeaders) {
+
+        return modified(PolicyId.of(policyId), label, null, dittoHeaders);
+    }
+
+    /**
+     * Creates a response to a {@code ModifySubject} command.
+     *
+     * @param policyId the Policy ID of the modified subject.
+     * @param label the Label of the PolicyEntry.
+     * @param dittoHeaders the headers of the preceding command.
+     * @return the response.
+     * @throws NullPointerException if any argument is {@code null}.
+     * @deprecated since 1.1.0, use {@link #modified(PolicyId, Label, SubjectId, DittoHeaders)} instead.
+     */
+    @Deprecated
+    public static ModifySubjectResponse modified(final PolicyId policyId, final Label label, final DittoHeaders dittoHeaders) {
+        return new ModifySubjectResponse(policyId, label, null, null, HttpStatusCode.NO_CONTENT, dittoHeaders);
+    }
+
     /**
      * Creates a response to a {@code ModifySubject} command.
      *
@@ -185,18 +219,20 @@ public static ModifySubjectResponse fromJson(final String jsonString, final Ditt
     public static ModifySubjectResponse fromJson(final JsonObject jsonObject, final DittoHeaders dittoHeaders) {
         return new CommandResponseJsonDeserializer<ModifySubjectResponse>(TYPE, jsonObject).deserialize(statusCode -> {
             final String extractedPolicyId =
-                    jsonObject.getValueOrThrow(PolicyModifyCommandResponse.JsonFields.JSON_POLICY_ID);
+                    jsonObject.getValueOrThrow(PolicyCommandResponse.JsonFields.JSON_POLICY_ID);
             final PolicyId policyId = PolicyId.of(extractedPolicyId);
             final Label label = PoliciesModelFactory.newLabel(jsonObject.getValueOrThrow(JSON_LABEL));
 
-            final SubjectId extractedSubjectId = SubjectId.newInstance(jsonObject.getValueOrThrow(JSON_SUBJECT_ID));
+            final Optional<String> extractedSubjectId = jsonObject.getValue(JSON_SUBJECT_ID);
 
             final Subject extractedSubjectCreated = jsonObject.getValue(JSON_SUBJECT)
                     .map(JsonValue::asObject)
-                    .map(obj -> PoliciesModelFactory.newSubject(extractedSubjectId, obj))
+                    .flatMap(obj -> extractedSubjectId.map(subjectId -> PoliciesModelFactory.newSubject(subjectId, obj)))
                     .orElse(null);
 
-            return new ModifySubjectResponse(policyId, label, extractedSubjectId, extractedSubjectCreated, statusCode,
+            return new ModifySubjectResponse(policyId, label,
+                    extractedSubjectId.map(SubjectId::newInstance).orElse(null),
+                    extractedSubjectCreated, statusCode,
                     dittoHeaders);
         });
     }
@@ -231,6 +267,9 @@ public Optional<JsonValue> getEntity(final JsonSchemaVersion schemaVersion) {
 
     @Override
     public JsonPointer getResourcePath() {
+        if (null == subjectId) {
+            return JsonPointer.empty();
+        }
         final String path = "/entries/" + label + "/subjects/" + subjectId;
         return JsonPointer.of(path);
     }
@@ -240,10 +279,12 @@ protected void appendPayload(final JsonObjectBuilder jsonObjectBuilder, final Js
             final Predicate<JsonField> thePredicate) {
 
         final Predicate<JsonField> predicate = schemaVersion.and(thePredicate);
-        jsonObjectBuilder.set(PolicyModifyCommandResponse.JsonFields.JSON_POLICY_ID, String.valueOf(policyId),
+        jsonObjectBuilder.set(PolicyCommandResponse.JsonFields.JSON_POLICY_ID, String.valueOf(policyId),
                 predicate);
         jsonObjectBuilder.set(JSON_LABEL, label.toString(), predicate);
-        jsonObjectBuilder.set(JSON_SUBJECT_ID, subjectId.toString(), predicate);
+        if (null != subjectId) {
+            jsonObjectBuilder.set(JSON_SUBJECT_ID, subjectId.toString(), predicate);
+        }
         if (null != subjectCreated) {
             jsonObjectBuilder.set(JSON_SUBJECT, subjectCreated.toJson(schemaVersion, thePredicate), predicate);
         }