diff --git a/sdk/avs/mgmt-v2020_03_20/pom.xml b/sdk/avs/mgmt-v2020_03_20/pom.xml
index 92eb36167cb0..066d63206cf9 100644
--- a/sdk/avs/mgmt-v2020_03_20/pom.xml
+++ b/sdk/avs/mgmt-v2020_03_20/pom.xml
@@ -11,11 +11,11 @@
     <parent>
         <groupId>com.microsoft.azure</groupId>
         <artifactId>azure-arm-parent</artifactId>
-        <version>1.3.2</version>
-        <relativePath>../../parents/azure-arm-parent/pom.xml</relativePath>
+        <version>1.1.0</version>
+        <relativePath>../../../pom.management.xml</relativePath>
     </parent>
     <artifactId>azure-mgmt-avs</artifactId>
-    <version>1.0.0</version>
+    <version>1.0.0-beta</version>
     <packaging>jar</packaging>
     <name>Microsoft Azure SDK for AVS Management</name>
     <description>This package contains Microsoft AVS Management SDK.</description>
diff --git a/sdk/avs/mgmt-v2020_03_20/src/main/java/com/microsoft/azure/management/avs/v2020_03_20/ExpressRouteAuthorization.java b/sdk/avs/mgmt-v2020_03_20/src/main/java/com/microsoft/azure/management/avs/v2020_03_20/ExpressRouteAuthorization.java
index 71644a76ea23..685c8c0d6119 100644
--- a/sdk/avs/mgmt-v2020_03_20/src/main/java/com/microsoft/azure/management/avs/v2020_03_20/ExpressRouteAuthorization.java
+++ b/sdk/avs/mgmt-v2020_03_20/src/main/java/com/microsoft/azure/management/avs/v2020_03_20/ExpressRouteAuthorization.java
@@ -55,7 +55,7 @@ public interface ExpressRouteAuthorization extends HasInner<ExpressRouteAuthoriz
     /**
      * The entirety of the ExpressRouteAuthorization definition.
      */
-    interface Definition extends DefinitionStages.Blank, DefinitionStages.WithPrivateCloud, DefinitionStages.WithAuthorization, DefinitionStages.WithCreate {
+    interface Definition extends DefinitionStages.Blank, DefinitionStages.WithPrivateCloud, DefinitionStages.WithCreate {
     }
 
     /**
@@ -78,19 +78,7 @@ interface WithPrivateCloud {
             * @param privateCloudName The name of the private cloud
             * @return the next definition stage
             */
-            WithAuthorization withExistingPrivateCloud(String resourceGroupName, String privateCloudName);
-        }
-
-        /**
-         * The stage of the expressrouteauthorization definition allowing to specify Authorization.
-         */
-        interface WithAuthorization {
-           /**
-            * Specifies authorization.
-            * @param authorization An ExpressRoute Circuit Authorization
-            * @return the next definition stage
-            */
-            WithCreate withAuthorization(Object authorization);
+            WithCreate withExistingPrivateCloud(String resourceGroupName, String privateCloudName);
         }
 
         /**
@@ -104,24 +92,12 @@ interface WithCreate extends Creatable<ExpressRouteAuthorization> {
     /**
      * The template for a ExpressRouteAuthorization update operation, containing all the settings that can be modified.
      */
-    interface Update extends Appliable<ExpressRouteAuthorization>, UpdateStages.WithAuthorization {
+    interface Update extends Appliable<ExpressRouteAuthorization> {
     }
 
     /**
      * Grouping of ExpressRouteAuthorization update stages.
      */
     interface UpdateStages {
-        /**
-         * The stage of the expressrouteauthorization update allowing to specify Authorization.
-         */
-        interface WithAuthorization {
-            /**
-             * Specifies authorization.
-             * @param authorization An ExpressRoute Circuit Authorization
-             * @return the next update stage
-             */
-            Update withAuthorization(Object authorization);
-        }
-
     }
 }
diff --git a/sdk/avs/mgmt-v2020_03_20/src/main/java/com/microsoft/azure/management/avs/v2020_03_20/HcxEnterpriseSite.java b/sdk/avs/mgmt-v2020_03_20/src/main/java/com/microsoft/azure/management/avs/v2020_03_20/HcxEnterpriseSite.java
index 728b04e905b0..d12bdc8686bf 100644
--- a/sdk/avs/mgmt-v2020_03_20/src/main/java/com/microsoft/azure/management/avs/v2020_03_20/HcxEnterpriseSite.java
+++ b/sdk/avs/mgmt-v2020_03_20/src/main/java/com/microsoft/azure/management/avs/v2020_03_20/HcxEnterpriseSite.java
@@ -50,7 +50,7 @@ public interface HcxEnterpriseSite extends HasInner<HcxEnterpriseSiteInner>, Ind
     /**
      * The entirety of the HcxEnterpriseSite definition.
      */
-    interface Definition extends DefinitionStages.Blank, DefinitionStages.WithPrivateCloud, DefinitionStages.WithHcxEnterpriseSite, DefinitionStages.WithCreate {
+    interface Definition extends DefinitionStages.Blank, DefinitionStages.WithPrivateCloud, DefinitionStages.WithCreate {
     }
 
     /**
@@ -73,19 +73,7 @@ interface WithPrivateCloud {
             * @param privateCloudName The name of the private cloud
             * @return the next definition stage
             */
-            WithHcxEnterpriseSite withExistingPrivateCloud(String resourceGroupName, String privateCloudName);
-        }
-
-        /**
-         * The stage of the hcxenterprisesite definition allowing to specify HcxEnterpriseSite.
-         */
-        interface WithHcxEnterpriseSite {
-           /**
-            * Specifies hcxEnterpriseSite.
-            * @param hcxEnterpriseSite The HCX Enterprise Site
-            * @return the next definition stage
-            */
-            WithCreate withHcxEnterpriseSite(Object hcxEnterpriseSite);
+            WithCreate withExistingPrivateCloud(String resourceGroupName, String privateCloudName);
         }
 
         /**
@@ -99,24 +87,12 @@ interface WithCreate extends Creatable<HcxEnterpriseSite> {
     /**
      * The template for a HcxEnterpriseSite update operation, containing all the settings that can be modified.
      */
-    interface Update extends Appliable<HcxEnterpriseSite>, UpdateStages.WithHcxEnterpriseSite {
+    interface Update extends Appliable<HcxEnterpriseSite> {
     }
 
     /**
      * Grouping of HcxEnterpriseSite update stages.
      */
     interface UpdateStages {
-        /**
-         * The stage of the hcxenterprisesite update allowing to specify HcxEnterpriseSite.
-         */
-        interface WithHcxEnterpriseSite {
-            /**
-             * Specifies hcxEnterpriseSite.
-             * @param hcxEnterpriseSite The HCX Enterprise Site
-             * @return the next update stage
-             */
-            Update withHcxEnterpriseSite(Object hcxEnterpriseSite);
-        }
-
     }
 }
diff --git a/sdk/avs/mgmt-v2020_03_20/src/main/java/com/microsoft/azure/management/avs/v2020_03_20/implementation/AuthorizationsInner.java b/sdk/avs/mgmt-v2020_03_20/src/main/java/com/microsoft/azure/management/avs/v2020_03_20/implementation/AuthorizationsInner.java
index aa782ce4c343..e7793a56700c 100644
--- a/sdk/avs/mgmt-v2020_03_20/src/main/java/com/microsoft/azure/management/avs/v2020_03_20/implementation/AuthorizationsInner.java
+++ b/sdk/avs/mgmt-v2020_03_20/src/main/java/com/microsoft/azure/management/avs/v2020_03_20/implementation/AuthorizationsInner.java
@@ -70,11 +70,11 @@ interface AuthorizationsService {
 
         @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.avs.v2020_03_20.Authorizations createOrUpdate" })
         @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.AVS/privateClouds/{privateCloudName}/authorizations/{authorizationName}")
-        Observable<Response<ResponseBody>> createOrUpdate(@Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Path("privateCloudName") String privateCloudName, @Path("authorizationName") String authorizationName, @Body Object authorization, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+        Observable<Response<ResponseBody>> createOrUpdate(@Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Path("privateCloudName") String privateCloudName, @Path("authorizationName") String authorizationName, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Body ExpressRouteAuthorizationInner authorization, @Header("User-Agent") String userAgent);
 
         @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.avs.v2020_03_20.Authorizations beginCreateOrUpdate" })
         @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.AVS/privateClouds/{privateCloudName}/authorizations/{authorizationName}")
-        Observable<Response<ResponseBody>> beginCreateOrUpdate(@Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Path("privateCloudName") String privateCloudName, @Path("authorizationName") String authorizationName, @Body Object authorization, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+        Observable<Response<ResponseBody>> beginCreateOrUpdate(@Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Path("privateCloudName") String privateCloudName, @Path("authorizationName") String authorizationName, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Body ExpressRouteAuthorizationInner authorization, @Header("User-Agent") String userAgent);
 
         @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.avs.v2020_03_20.Authorizations delete" })
         @HTTP(path = "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.AVS/privateClouds/{privateCloudName}/authorizations/{authorizationName}", method = "DELETE", hasBody = true)
@@ -312,14 +312,13 @@ private ServiceResponse<ExpressRouteAuthorizationInner> getDelegate(Response<Res
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param privateCloudName The name of the private cloud.
      * @param authorizationName Name of the ExpressRoute Circuit Authorization in the private cloud
-     * @param authorization An ExpressRoute Circuit Authorization
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @throws CloudException thrown if the request is rejected by server
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
      * @return the ExpressRouteAuthorizationInner object if successful.
      */
-    public ExpressRouteAuthorizationInner createOrUpdate(String resourceGroupName, String privateCloudName, String authorizationName, Object authorization) {
-        return createOrUpdateWithServiceResponseAsync(resourceGroupName, privateCloudName, authorizationName, authorization).toBlocking().last().body();
+    public ExpressRouteAuthorizationInner createOrUpdate(String resourceGroupName, String privateCloudName, String authorizationName) {
+        return createOrUpdateWithServiceResponseAsync(resourceGroupName, privateCloudName, authorizationName).toBlocking().last().body();
     }
 
     /**
@@ -328,13 +327,12 @@ public ExpressRouteAuthorizationInner createOrUpdate(String resourceGroupName, S
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param privateCloudName The name of the private cloud.
      * @param authorizationName Name of the ExpressRoute Circuit Authorization in the private cloud
-     * @param authorization An ExpressRoute Circuit Authorization
      * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the {@link ServiceFuture} object
      */
-    public ServiceFuture<ExpressRouteAuthorizationInner> createOrUpdateAsync(String resourceGroupName, String privateCloudName, String authorizationName, Object authorization, final ServiceCallback<ExpressRouteAuthorizationInner> serviceCallback) {
-        return ServiceFuture.fromResponse(createOrUpdateWithServiceResponseAsync(resourceGroupName, privateCloudName, authorizationName, authorization), serviceCallback);
+    public ServiceFuture<ExpressRouteAuthorizationInner> createOrUpdateAsync(String resourceGroupName, String privateCloudName, String authorizationName, final ServiceCallback<ExpressRouteAuthorizationInner> serviceCallback) {
+        return ServiceFuture.fromResponse(createOrUpdateWithServiceResponseAsync(resourceGroupName, privateCloudName, authorizationName), serviceCallback);
     }
 
     /**
@@ -343,12 +341,11 @@ public ServiceFuture<ExpressRouteAuthorizationInner> createOrUpdateAsync(String
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param privateCloudName The name of the private cloud.
      * @param authorizationName Name of the ExpressRoute Circuit Authorization in the private cloud
-     * @param authorization An ExpressRoute Circuit Authorization
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the observable for the request
      */
-    public Observable<ExpressRouteAuthorizationInner> createOrUpdateAsync(String resourceGroupName, String privateCloudName, String authorizationName, Object authorization) {
-        return createOrUpdateWithServiceResponseAsync(resourceGroupName, privateCloudName, authorizationName, authorization).map(new Func1<ServiceResponse<ExpressRouteAuthorizationInner>, ExpressRouteAuthorizationInner>() {
+    public Observable<ExpressRouteAuthorizationInner> createOrUpdateAsync(String resourceGroupName, String privateCloudName, String authorizationName) {
+        return createOrUpdateWithServiceResponseAsync(resourceGroupName, privateCloudName, authorizationName).map(new Func1<ServiceResponse<ExpressRouteAuthorizationInner>, ExpressRouteAuthorizationInner>() {
             @Override
             public ExpressRouteAuthorizationInner call(ServiceResponse<ExpressRouteAuthorizationInner> response) {
                 return response.body();
@@ -362,11 +359,10 @@ public ExpressRouteAuthorizationInner call(ServiceResponse<ExpressRouteAuthoriza
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param privateCloudName The name of the private cloud.
      * @param authorizationName Name of the ExpressRoute Circuit Authorization in the private cloud
-     * @param authorization An ExpressRoute Circuit Authorization
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the observable for the request
      */
-    public Observable<ServiceResponse<ExpressRouteAuthorizationInner>> createOrUpdateWithServiceResponseAsync(String resourceGroupName, String privateCloudName, String authorizationName, Object authorization) {
+    public Observable<ServiceResponse<ExpressRouteAuthorizationInner>> createOrUpdateWithServiceResponseAsync(String resourceGroupName, String privateCloudName, String authorizationName) {
         if (this.client.subscriptionId() == null) {
             throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
         }
@@ -379,13 +375,10 @@ public Observable<ServiceResponse<ExpressRouteAuthorizationInner>> createOrUpdat
         if (authorizationName == null) {
             throw new IllegalArgumentException("Parameter authorizationName is required and cannot be null.");
         }
-        if (authorization == null) {
-            throw new IllegalArgumentException("Parameter authorization is required and cannot be null.");
-        }
         if (this.client.apiVersion() == null) {
             throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
         }
-        Observable<Response<ResponseBody>> observable = service.createOrUpdate(this.client.subscriptionId(), resourceGroupName, privateCloudName, authorizationName, authorization, this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent());
+        Observable<Response<ResponseBody>> observable = service.createOrUpdate(this.client.subscriptionId(), resourceGroupName, privateCloudName, authorizationName, this.client.apiVersion(), this.client.acceptLanguage(), authorization, this.client.userAgent());
         return client.getAzureClient().getPutOrPatchResultAsync(observable, new TypeToken<ExpressRouteAuthorizationInner>() { }.getType());
     }
 
@@ -395,14 +388,13 @@ public Observable<ServiceResponse<ExpressRouteAuthorizationInner>> createOrUpdat
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param privateCloudName The name of the private cloud.
      * @param authorizationName Name of the ExpressRoute Circuit Authorization in the private cloud
-     * @param authorization An ExpressRoute Circuit Authorization
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @throws CloudException thrown if the request is rejected by server
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
      * @return the ExpressRouteAuthorizationInner object if successful.
      */
-    public ExpressRouteAuthorizationInner beginCreateOrUpdate(String resourceGroupName, String privateCloudName, String authorizationName, Object authorization) {
-        return beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, privateCloudName, authorizationName, authorization).toBlocking().single().body();
+    public ExpressRouteAuthorizationInner beginCreateOrUpdate(String resourceGroupName, String privateCloudName, String authorizationName) {
+        return beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, privateCloudName, authorizationName).toBlocking().single().body();
     }
 
     /**
@@ -411,13 +403,12 @@ public ExpressRouteAuthorizationInner beginCreateOrUpdate(String resourceGroupNa
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param privateCloudName The name of the private cloud.
      * @param authorizationName Name of the ExpressRoute Circuit Authorization in the private cloud
-     * @param authorization An ExpressRoute Circuit Authorization
      * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the {@link ServiceFuture} object
      */
-    public ServiceFuture<ExpressRouteAuthorizationInner> beginCreateOrUpdateAsync(String resourceGroupName, String privateCloudName, String authorizationName, Object authorization, final ServiceCallback<ExpressRouteAuthorizationInner> serviceCallback) {
-        return ServiceFuture.fromResponse(beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, privateCloudName, authorizationName, authorization), serviceCallback);
+    public ServiceFuture<ExpressRouteAuthorizationInner> beginCreateOrUpdateAsync(String resourceGroupName, String privateCloudName, String authorizationName, final ServiceCallback<ExpressRouteAuthorizationInner> serviceCallback) {
+        return ServiceFuture.fromResponse(beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, privateCloudName, authorizationName), serviceCallback);
     }
 
     /**
@@ -426,12 +417,11 @@ public ServiceFuture<ExpressRouteAuthorizationInner> beginCreateOrUpdateAsync(St
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param privateCloudName The name of the private cloud.
      * @param authorizationName Name of the ExpressRoute Circuit Authorization in the private cloud
-     * @param authorization An ExpressRoute Circuit Authorization
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the observable to the ExpressRouteAuthorizationInner object
      */
-    public Observable<ExpressRouteAuthorizationInner> beginCreateOrUpdateAsync(String resourceGroupName, String privateCloudName, String authorizationName, Object authorization) {
-        return beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, privateCloudName, authorizationName, authorization).map(new Func1<ServiceResponse<ExpressRouteAuthorizationInner>, ExpressRouteAuthorizationInner>() {
+    public Observable<ExpressRouteAuthorizationInner> beginCreateOrUpdateAsync(String resourceGroupName, String privateCloudName, String authorizationName) {
+        return beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, privateCloudName, authorizationName).map(new Func1<ServiceResponse<ExpressRouteAuthorizationInner>, ExpressRouteAuthorizationInner>() {
             @Override
             public ExpressRouteAuthorizationInner call(ServiceResponse<ExpressRouteAuthorizationInner> response) {
                 return response.body();
@@ -445,11 +435,10 @@ public ExpressRouteAuthorizationInner call(ServiceResponse<ExpressRouteAuthoriza
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param privateCloudName The name of the private cloud.
      * @param authorizationName Name of the ExpressRoute Circuit Authorization in the private cloud
-     * @param authorization An ExpressRoute Circuit Authorization
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the observable to the ExpressRouteAuthorizationInner object
      */
-    public Observable<ServiceResponse<ExpressRouteAuthorizationInner>> beginCreateOrUpdateWithServiceResponseAsync(String resourceGroupName, String privateCloudName, String authorizationName, Object authorization) {
+    public Observable<ServiceResponse<ExpressRouteAuthorizationInner>> beginCreateOrUpdateWithServiceResponseAsync(String resourceGroupName, String privateCloudName, String authorizationName) {
         if (this.client.subscriptionId() == null) {
             throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
         }
@@ -462,13 +451,10 @@ public Observable<ServiceResponse<ExpressRouteAuthorizationInner>> beginCreateOr
         if (authorizationName == null) {
             throw new IllegalArgumentException("Parameter authorizationName is required and cannot be null.");
         }
-        if (authorization == null) {
-            throw new IllegalArgumentException("Parameter authorization is required and cannot be null.");
-        }
         if (this.client.apiVersion() == null) {
             throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
         }
-        return service.beginCreateOrUpdate(this.client.subscriptionId(), resourceGroupName, privateCloudName, authorizationName, authorization, this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+        return service.beginCreateOrUpdate(this.client.subscriptionId(), resourceGroupName, privateCloudName, authorizationName, this.client.apiVersion(), this.client.acceptLanguage(), authorization, this.client.userAgent())
             .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<ExpressRouteAuthorizationInner>>>() {
                 @Override
                 public Observable<ServiceResponse<ExpressRouteAuthorizationInner>> call(Response<ResponseBody> response) {
diff --git a/sdk/avs/mgmt-v2020_03_20/src/main/java/com/microsoft/azure/management/avs/v2020_03_20/implementation/ExpressRouteAuthorizationImpl.java b/sdk/avs/mgmt-v2020_03_20/src/main/java/com/microsoft/azure/management/avs/v2020_03_20/implementation/ExpressRouteAuthorizationImpl.java
index d5d0be405723..4175041e8c91 100644
--- a/sdk/avs/mgmt-v2020_03_20/src/main/java/com/microsoft/azure/management/avs/v2020_03_20/implementation/ExpressRouteAuthorizationImpl.java
+++ b/sdk/avs/mgmt-v2020_03_20/src/main/java/com/microsoft/azure/management/avs/v2020_03_20/implementation/ExpressRouteAuthorizationImpl.java
@@ -18,8 +18,6 @@ class ExpressRouteAuthorizationImpl extends CreatableUpdatableImpl<ExpressRouteA
     private String resourceGroupName;
     private String privateCloudName;
     private String authorizationName;
-    private Object cauthorization;
-    private Object uauthorization;
 
     ExpressRouteAuthorizationImpl(String name, AVSManager manager) {
         super(name, new ExpressRouteAuthorizationInner());
@@ -49,14 +47,14 @@ public AVSManager manager() {
     @Override
     public Observable<ExpressRouteAuthorization> createResourceAsync() {
         AuthorizationsInner client = this.manager().inner().authorizations();
-        return client.createOrUpdateAsync(this.resourceGroupName, this.privateCloudName, this.authorizationName, this.cauthorization)
+        return client.createOrUpdateAsync(this.resourceGroupName, this.privateCloudName, this.authorizationName)
             .map(innerToFluentMap(this));
     }
 
     @Override
     public Observable<ExpressRouteAuthorization> updateResourceAsync() {
         AuthorizationsInner client = this.manager().inner().authorizations();
-        return client.createOrUpdateAsync(this.resourceGroupName, this.privateCloudName, this.authorizationName, this.uauthorization)
+        return client.createOrUpdateAsync(this.resourceGroupName, this.privateCloudName, this.authorizationName)
             .map(innerToFluentMap(this));
     }
 
@@ -109,14 +107,4 @@ public ExpressRouteAuthorizationImpl withExistingPrivateCloud(String resourceGro
         return this;
     }
 
-    @Override
-    public ExpressRouteAuthorizationImpl withAuthorization(Object authorization) {
-        if (isInCreateMode()) {
-            this.cauthorization = authorization;
-        } else {
-            this.uauthorization = authorization;
-        }
-        return this;
-    }
-
 }
diff --git a/sdk/avs/mgmt-v2020_03_20/src/main/java/com/microsoft/azure/management/avs/v2020_03_20/implementation/HcxEnterpriseSiteImpl.java b/sdk/avs/mgmt-v2020_03_20/src/main/java/com/microsoft/azure/management/avs/v2020_03_20/implementation/HcxEnterpriseSiteImpl.java
index 9d8bf32a10f7..55084491594e 100644
--- a/sdk/avs/mgmt-v2020_03_20/src/main/java/com/microsoft/azure/management/avs/v2020_03_20/implementation/HcxEnterpriseSiteImpl.java
+++ b/sdk/avs/mgmt-v2020_03_20/src/main/java/com/microsoft/azure/management/avs/v2020_03_20/implementation/HcxEnterpriseSiteImpl.java
@@ -18,8 +18,6 @@ class HcxEnterpriseSiteImpl extends CreatableUpdatableImpl<HcxEnterpriseSite, Hc
     private String resourceGroupName;
     private String privateCloudName;
     private String hcxEnterpriseSiteName;
-    private Object chcxEnterpriseSite;
-    private Object uhcxEnterpriseSite;
 
     HcxEnterpriseSiteImpl(String name, AVSManager manager) {
         super(name, new HcxEnterpriseSiteInner());
@@ -49,14 +47,14 @@ public AVSManager manager() {
     @Override
     public Observable<HcxEnterpriseSite> createResourceAsync() {
         HcxEnterpriseSitesInner client = this.manager().inner().hcxEnterpriseSites();
-        return client.createOrUpdateAsync(this.resourceGroupName, this.privateCloudName, this.hcxEnterpriseSiteName, this.chcxEnterpriseSite)
+        return client.createOrUpdateAsync(this.resourceGroupName, this.privateCloudName, this.hcxEnterpriseSiteName)
             .map(innerToFluentMap(this));
     }
 
     @Override
     public Observable<HcxEnterpriseSite> updateResourceAsync() {
         HcxEnterpriseSitesInner client = this.manager().inner().hcxEnterpriseSites();
-        return client.createOrUpdateAsync(this.resourceGroupName, this.privateCloudName, this.hcxEnterpriseSiteName, this.uhcxEnterpriseSite)
+        return client.createOrUpdateAsync(this.resourceGroupName, this.privateCloudName, this.hcxEnterpriseSiteName)
             .map(innerToFluentMap(this));
     }
 
@@ -104,14 +102,4 @@ public HcxEnterpriseSiteImpl withExistingPrivateCloud(String resourceGroupName,
         return this;
     }
 
-    @Override
-    public HcxEnterpriseSiteImpl withHcxEnterpriseSite(Object hcxEnterpriseSite) {
-        if (isInCreateMode()) {
-            this.chcxEnterpriseSite = hcxEnterpriseSite;
-        } else {
-            this.uhcxEnterpriseSite = hcxEnterpriseSite;
-        }
-        return this;
-    }
-
 }
diff --git a/sdk/avs/mgmt-v2020_03_20/src/main/java/com/microsoft/azure/management/avs/v2020_03_20/implementation/HcxEnterpriseSitesInner.java b/sdk/avs/mgmt-v2020_03_20/src/main/java/com/microsoft/azure/management/avs/v2020_03_20/implementation/HcxEnterpriseSitesInner.java
index 1703b68273d3..52d8b856bb93 100644
--- a/sdk/avs/mgmt-v2020_03_20/src/main/java/com/microsoft/azure/management/avs/v2020_03_20/implementation/HcxEnterpriseSitesInner.java
+++ b/sdk/avs/mgmt-v2020_03_20/src/main/java/com/microsoft/azure/management/avs/v2020_03_20/implementation/HcxEnterpriseSitesInner.java
@@ -70,7 +70,7 @@ interface HcxEnterpriseSitesService {
 
         @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.avs.v2020_03_20.HcxEnterpriseSites createOrUpdate" })
         @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.AVS/privateClouds/{privateCloudName}/hcxEnterpriseSites/{hcxEnterpriseSiteName}")
-        Observable<Response<ResponseBody>> createOrUpdate(@Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Path("privateCloudName") String privateCloudName, @Path("hcxEnterpriseSiteName") String hcxEnterpriseSiteName, @Body Object hcxEnterpriseSite, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+        Observable<Response<ResponseBody>> createOrUpdate(@Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Path("privateCloudName") String privateCloudName, @Path("hcxEnterpriseSiteName") String hcxEnterpriseSiteName, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Body HcxEnterpriseSiteInner hcxEnterpriseSite, @Header("User-Agent") String userAgent);
 
         @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.avs.v2020_03_20.HcxEnterpriseSites delete" })
         @HTTP(path = "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.AVS/privateClouds/{privateCloudName}/hcxEnterpriseSites/{hcxEnterpriseSiteName}", method = "DELETE", hasBody = true)
@@ -304,14 +304,13 @@ private ServiceResponse<HcxEnterpriseSiteInner> getDelegate(Response<ResponseBod
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param privateCloudName The name of the private cloud.
      * @param hcxEnterpriseSiteName Name of the HCX Enterprise Site in the private cloud
-     * @param hcxEnterpriseSite The HCX Enterprise Site
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @throws CloudException thrown if the request is rejected by server
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
      * @return the HcxEnterpriseSiteInner object if successful.
      */
-    public HcxEnterpriseSiteInner createOrUpdate(String resourceGroupName, String privateCloudName, String hcxEnterpriseSiteName, Object hcxEnterpriseSite) {
-        return createOrUpdateWithServiceResponseAsync(resourceGroupName, privateCloudName, hcxEnterpriseSiteName, hcxEnterpriseSite).toBlocking().single().body();
+    public HcxEnterpriseSiteInner createOrUpdate(String resourceGroupName, String privateCloudName, String hcxEnterpriseSiteName) {
+        return createOrUpdateWithServiceResponseAsync(resourceGroupName, privateCloudName, hcxEnterpriseSiteName).toBlocking().single().body();
     }
 
     /**
@@ -320,13 +319,12 @@ public HcxEnterpriseSiteInner createOrUpdate(String resourceGroupName, String pr
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param privateCloudName The name of the private cloud.
      * @param hcxEnterpriseSiteName Name of the HCX Enterprise Site in the private cloud
-     * @param hcxEnterpriseSite The HCX Enterprise Site
      * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the {@link ServiceFuture} object
      */
-    public ServiceFuture<HcxEnterpriseSiteInner> createOrUpdateAsync(String resourceGroupName, String privateCloudName, String hcxEnterpriseSiteName, Object hcxEnterpriseSite, final ServiceCallback<HcxEnterpriseSiteInner> serviceCallback) {
-        return ServiceFuture.fromResponse(createOrUpdateWithServiceResponseAsync(resourceGroupName, privateCloudName, hcxEnterpriseSiteName, hcxEnterpriseSite), serviceCallback);
+    public ServiceFuture<HcxEnterpriseSiteInner> createOrUpdateAsync(String resourceGroupName, String privateCloudName, String hcxEnterpriseSiteName, final ServiceCallback<HcxEnterpriseSiteInner> serviceCallback) {
+        return ServiceFuture.fromResponse(createOrUpdateWithServiceResponseAsync(resourceGroupName, privateCloudName, hcxEnterpriseSiteName), serviceCallback);
     }
 
     /**
@@ -335,12 +333,11 @@ public ServiceFuture<HcxEnterpriseSiteInner> createOrUpdateAsync(String resource
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param privateCloudName The name of the private cloud.
      * @param hcxEnterpriseSiteName Name of the HCX Enterprise Site in the private cloud
-     * @param hcxEnterpriseSite The HCX Enterprise Site
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the observable to the HcxEnterpriseSiteInner object
      */
-    public Observable<HcxEnterpriseSiteInner> createOrUpdateAsync(String resourceGroupName, String privateCloudName, String hcxEnterpriseSiteName, Object hcxEnterpriseSite) {
-        return createOrUpdateWithServiceResponseAsync(resourceGroupName, privateCloudName, hcxEnterpriseSiteName, hcxEnterpriseSite).map(new Func1<ServiceResponse<HcxEnterpriseSiteInner>, HcxEnterpriseSiteInner>() {
+    public Observable<HcxEnterpriseSiteInner> createOrUpdateAsync(String resourceGroupName, String privateCloudName, String hcxEnterpriseSiteName) {
+        return createOrUpdateWithServiceResponseAsync(resourceGroupName, privateCloudName, hcxEnterpriseSiteName).map(new Func1<ServiceResponse<HcxEnterpriseSiteInner>, HcxEnterpriseSiteInner>() {
             @Override
             public HcxEnterpriseSiteInner call(ServiceResponse<HcxEnterpriseSiteInner> response) {
                 return response.body();
@@ -354,11 +351,10 @@ public HcxEnterpriseSiteInner call(ServiceResponse<HcxEnterpriseSiteInner> respo
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param privateCloudName The name of the private cloud.
      * @param hcxEnterpriseSiteName Name of the HCX Enterprise Site in the private cloud
-     * @param hcxEnterpriseSite The HCX Enterprise Site
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the observable to the HcxEnterpriseSiteInner object
      */
-    public Observable<ServiceResponse<HcxEnterpriseSiteInner>> createOrUpdateWithServiceResponseAsync(String resourceGroupName, String privateCloudName, String hcxEnterpriseSiteName, Object hcxEnterpriseSite) {
+    public Observable<ServiceResponse<HcxEnterpriseSiteInner>> createOrUpdateWithServiceResponseAsync(String resourceGroupName, String privateCloudName, String hcxEnterpriseSiteName) {
         if (this.client.subscriptionId() == null) {
             throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
         }
@@ -371,13 +367,10 @@ public Observable<ServiceResponse<HcxEnterpriseSiteInner>> createOrUpdateWithSer
         if (hcxEnterpriseSiteName == null) {
             throw new IllegalArgumentException("Parameter hcxEnterpriseSiteName is required and cannot be null.");
         }
-        if (hcxEnterpriseSite == null) {
-            throw new IllegalArgumentException("Parameter hcxEnterpriseSite is required and cannot be null.");
-        }
         if (this.client.apiVersion() == null) {
             throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
         }
-        return service.createOrUpdate(this.client.subscriptionId(), resourceGroupName, privateCloudName, hcxEnterpriseSiteName, hcxEnterpriseSite, this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+        return service.createOrUpdate(this.client.subscriptionId(), resourceGroupName, privateCloudName, hcxEnterpriseSiteName, this.client.apiVersion(), this.client.acceptLanguage(), hcxEnterpriseSite, this.client.userAgent())
             .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<HcxEnterpriseSiteInner>>>() {
                 @Override
                 public Observable<ServiceResponse<HcxEnterpriseSiteInner>> call(Response<ResponseBody> response) {