diff --git a/sdk/containerregistry/mgmt-v2019_12_01_preview/src/main/java/com/microsoft/azure/management/containerregistry/v2019_12_01_preview/TaskRun.java b/sdk/containerregistry/mgmt-v2019_12_01_preview/src/main/java/com/microsoft/azure/management/containerregistry/v2019_12_01_preview/TaskRun.java
index b81a993bb6f88..a492200cf76c6 100644
--- a/sdk/containerregistry/mgmt-v2019_12_01_preview/src/main/java/com/microsoft/azure/management/containerregistry/v2019_12_01_preview/TaskRun.java
+++ b/sdk/containerregistry/mgmt-v2019_12_01_preview/src/main/java/com/microsoft/azure/management/containerregistry/v2019_12_01_preview/TaskRun.java
@@ -38,11 +38,6 @@ public interface TaskRun extends HasInner<TaskRunInner>, Indexable, Refreshable<
      */
     IdentityProperties identity();
 
-    /**
-     * @return the location value.
-     */
-    String location();
-
     /**
      * @return the name value.
      */
@@ -63,11 +58,6 @@ public interface TaskRun extends HasInner<TaskRunInner>, Indexable, Refreshable<
      */
     Run runResult();
 
-    /**
-     * @return the tags value.
-     */
-    Map<String, String> tags();
-
     /**
      * @return the type value.
      */
@@ -76,7 +66,7 @@ public interface TaskRun extends HasInner<TaskRunInner>, Indexable, Refreshable<
     /**
      * The entirety of the TaskRun definition.
      */
-    interface Definition extends DefinitionStages.Blank, DefinitionStages.WithRegistry, DefinitionStages.WithLocation, DefinitionStages.WithCreate {
+    interface Definition extends DefinitionStages.Blank, DefinitionStages.WithRegistry, DefinitionStages.WithCreate {
     }
 
     /**
@@ -99,19 +89,7 @@ interface WithRegistry {
             * @param registryName The name of the container registry
             * @return the next definition stage
             */
-            WithLocation withExistingRegistry(String resourceGroupName, String registryName);
-        }
-
-        /**
-         * The stage of the taskrun definition allowing to specify Location.
-         */
-        interface WithLocation {
-           /**
-            * Specifies location.
-            * @param location The location of the resource. This cannot be changed after the resource is created
-            * @return the next definition stage
-            */
-            WithCreate withLocation(String location);
+            WithCreate withExistingRegistry(String resourceGroupName, String registryName);
         }
 
         /**
@@ -150,24 +128,12 @@ interface WithRunRequest {
             WithCreate withRunRequest(RunRequest runRequest);
         }
 
-        /**
-         * The stage of the taskrun definition allowing to specify Tags.
-         */
-        interface WithTags {
-            /**
-             * Specifies tags.
-             * @param tags The tags of the resource
-             * @return the next definition stage
-             */
-            WithCreate withTags(Map<String, String> tags);
-        }
-
         /**
          * The stage of the definition which contains all the minimum required inputs for
          * the resource to be created (via {@link WithCreate#create()}), but also allows
          * for any other optional settings to be specified.
          */
-        interface WithCreate extends Creatable<TaskRun>, DefinitionStages.WithForceUpdateTag, DefinitionStages.WithIdentity, DefinitionStages.WithRunRequest, DefinitionStages.WithTags {
+        interface WithCreate extends Creatable<TaskRun>, DefinitionStages.WithForceUpdateTag, DefinitionStages.WithIdentity, DefinitionStages.WithRunRequest {
         }
     }
     /**
diff --git a/sdk/containerregistry/mgmt-v2019_12_01_preview/src/main/java/com/microsoft/azure/management/containerregistry/v2019_12_01_preview/implementation/TaskRunImpl.java b/sdk/containerregistry/mgmt-v2019_12_01_preview/src/main/java/com/microsoft/azure/management/containerregistry/v2019_12_01_preview/implementation/TaskRunImpl.java
index fb0830618133d..e4b792335362c 100644
--- a/sdk/containerregistry/mgmt-v2019_12_01_preview/src/main/java/com/microsoft/azure/management/containerregistry/v2019_12_01_preview/implementation/TaskRunImpl.java
+++ b/sdk/containerregistry/mgmt-v2019_12_01_preview/src/main/java/com/microsoft/azure/management/containerregistry/v2019_12_01_preview/implementation/TaskRunImpl.java
@@ -111,11 +111,6 @@ public IdentityProperties identity() {
         return this.inner().identity();
     }
 
-    @Override
-    public String location() {
-        return this.inner().location();
-    }
-
     @Override
     public String name() {
         return this.inner().name();
@@ -141,11 +136,6 @@ public Run runResult() {
         }
     }
 
-    @Override
-    public Map<String, String> tags() {
-        return this.inner().getTags();
-    }
-
     @Override
     public String type() {
         return this.inner().type();
@@ -159,8 +149,8 @@ public TaskRunImpl withExistingRegistry(String resourceGroupName, String registr
     }
 
     @Override
-    public TaskRunImpl withLocation(String location) {
-        this.inner().withLocation(location);
+    public TaskRunImpl withTags(Map<String, String> tags) {
+        this.updateParameter.withTags(tags);
         return this;
     }
 
@@ -194,14 +184,4 @@ public TaskRunImpl withRunRequest(RunRequest runRequest) {
         return this;
     }
 
-    @Override
-    public TaskRunImpl withTags(Map<String, String> tags) {
-        if (isInCreateMode()) {
-            this.inner().withTags(tags);
-        } else {
-            this.updateParameter.withTags(tags);
-        }
-        return this;
-    }
-
 }
diff --git a/sdk/containerregistry/mgmt-v2019_12_01_preview/src/main/java/com/microsoft/azure/management/containerregistry/v2019_12_01_preview/implementation/TaskRunInner.java b/sdk/containerregistry/mgmt-v2019_12_01_preview/src/main/java/com/microsoft/azure/management/containerregistry/v2019_12_01_preview/implementation/TaskRunInner.java
index 872da3aad3513..307b943515477 100644
--- a/sdk/containerregistry/mgmt-v2019_12_01_preview/src/main/java/com/microsoft/azure/management/containerregistry/v2019_12_01_preview/implementation/TaskRunInner.java
+++ b/sdk/containerregistry/mgmt-v2019_12_01_preview/src/main/java/com/microsoft/azure/management/containerregistry/v2019_12_01_preview/implementation/TaskRunInner.java
@@ -13,14 +13,14 @@
 import com.microsoft.azure.management.containerregistry.v2019_12_01_preview.RunRequest;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.microsoft.rest.serializer.JsonFlatten;
-import com.microsoft.azure.Resource;
+import com.microsoft.azure.ProxyResource;
 
 /**
  * The task run that has the ARM resource and properties.
  * The task run will have the information of request and result of a run.
  */
 @JsonFlatten
-public class TaskRunInner extends Resource {
+public class TaskRunInner extends ProxyResource {
     /**
      * Identity for the resource.
      */